Pojo work 2

Some stuff you might want to update.