Finish skeleton, fix bugs, implement more fields