fixed lines that got removed accidentally during merging
Added skeleton module that I'll give functionality to later