WIP
Working but going to change api