WIP! Should hopefully finish tomorrow. Thoughts?